Make Python tools (i.e., xend and pygrub) conditionally compiled.

Config option is PYTHON_TOOLS, default is 'y'.

Signed-off-by: Ben Thomas <ben@virtualiron.com>

diff --git a/Config.mk b/Config.mk
index 7474ce19c540b65c6add58faf82bb2800d7fdf84..6f9f970fe645edff3be6c65c6bfbb831a4a31432 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -73,9 +73,10 @@ ACM_SECURITY ?= n
 ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
 
 # Optional components
-XENSTAT_XENTOP ?= y
-VTPM_TOOLS ?= n
+XENSTAT_XENTOP     ?= y
+VTPM_TOOLS         ?= n
 LIBXENAPI_BINDINGS ?= n
-XENFB_TOOLS ?= n
+XENFB_TOOLS        ?= n
+PYTHON_TOOLS       ?= y
 
 -include $(XEN_ROOT)/.config

diff --git a/tools/Makefile b/tools/Makefile
index b4156fc90435e496888824aa41c0f68220d939fe..7cd81f87bfe287529a178af326d8051b4e41b4bb 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -24,8 +24,8 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-SUBDIRS-y += python
-SUBDIRS-y += pygrub
+SUBDIRS-$(PYTHON_TOOLS) += python
+SUBDIRS-$(PYTHON_TOOLS) += pygrub
 endif
 
 .PHONY: all